From ff627aac360678ef6e7c42debca0833d1a389314 Mon Sep 17 00:00:00 2001 From: "cl349@freefall.cl.cam.ac.uk" Date: Tue, 7 Sep 2004 16:57:34 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.134 (413de87ejWYLp0qBEU80dbncZiMBFA) g/c PTWR_TRACK_DOMAIN --- xen/arch/x86/memory.c | 27 --------------------------- xen/include/asm-x86/mm.h | 3 --- 2 files changed, 30 deletions(-) diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c index ab52dfee61..08dd76c7bf 100644 --- a/xen/arch/x86/memory.c +++ b/xen/arch/x86/memory.c @@ -1488,9 +1488,6 @@ ptwr_info_t ptwr_info[NR_CPUS] = { .disconnected = ENTRIES_PER_L2_PAGETABLE, .writable_idx = 0, -#ifdef PTWR_TRACK_DOMAIN - .domain = 0, -#endif } }; @@ -1513,11 +1510,6 @@ void ptwr_reconnect_disconnected(unsigned long addr) unsigned long *writable_pte = (unsigned long *)&linear_pg_table [ptwr_info[cpu].writable_l1>>PAGE_SHIFT]; -#ifdef PTWR_TRACK_DOMAIN - if (ptwr_domain[cpu] != current->domain) - printk("ptwr_reconnect_disconnected domain mismatch %d != %d\n", - ptwr_domain[cpu], current->domain); -#endif PTWR_PRINTK(("[A] page fault in disconn space: addr %08lx space %08lx\n", addr, ptwr_info[cpu].disconnected << L2_PAGETABLE_SHIFT)); pl2e = &linear_l2_table[ptwr_info[cpu].disconnected]; @@ -1594,20 +1586,6 @@ void ptwr_flush_inactive(void) int cpu = smp_processor_id(); int i, idx; -#ifdef PTWR_TRACK_DOMAIN - if (ptwr_info[cpu].domain != current->domain) - printk("ptwr_flush_inactive domain mismatch %d != %d\n", - ptwr_info[cpu].domain, current->domain); -#endif -#if 0 - { - static int maxidx = 0; - if (ptwr_info[cpu].writable_idx > maxidx) { - maxidx = ptwr_info[cpu].writable_idx; - printk("maxidx on cpu %d now %d\n", cpu, maxidx); - } - } -#endif for (idx = 0; idx < ptwr_info[cpu].writable_idx; idx++) { unsigned long *writable_pte = (unsigned long *)&linear_pg_table [ptwr_info[cpu].writables[idx]>>PAGE_SHIFT]; @@ -1677,11 +1655,6 @@ int ptwr_do_page_fault(unsigned long addr) page = &frame_table[pfn]; if ( (page->u.inuse.type_info & PGT_type_mask) == PGT_l1_page_table ) { -#ifdef PTWR_TRACK_DOMAIN - if ( ptwr_info[cpu].domain != current->domain ) - printk("ptwr_do_page_fault domain mismatch %d != %d\n", - ptwr_info[cpu].domain, current->domain); -#endif pl2e = &linear_l2_table[(page->u.inuse.type_info & PGT_va_mask) >> PGT_va_shift]; PTWR_PRINTK(("page_fault on l1 pt at va %08lx, pt for %08x, " diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index ec0f88cee6..09005b318f 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -378,9 +378,6 @@ typedef struct { unsigned long writables[PTWR_NR_WRITABLES]; int writable_idx; l1_pgentry_t writable_page[PTWR_NR_WRITABLES][ENTRIES_PER_L1_PAGETABLE]; -#ifdef PTWR_TRACK_DOMAIN - domid_t domain; -#endif } __cacheline_aligned ptwr_info_t; extern ptwr_info_t ptwr_info[]; -- 2.30.2